also revert change in how the dialog's vbox was added (bug #539732).

2008-06-24  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkdialog.c (gtk_dialog_init): also revert change in how
	the dialog's vbox was added (bug #539732).

svn path=/trunk/; revision=20681

diff --git a/ChangeLog b/ChangeLog
index 9d5d759ec1bb5caa2d8396e3d8a3d4753ea5a32d..67e4f79dd3d1dfd58e35e6b83e51ce26ace0b9a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-24  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkdialog.c (gtk_dialog_init): also revert change in how
+       the dialog's vbox was added (bug #539732).
+
 2008-06-24  Carlos Garnacho  <carlos@imendio.com>
 
        * gtk/gtkdialog.[ch]: Remove container implementation, which isn't

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 45471fad409d8da1b286dec7669f739387bc313b..94aaeb3bd3241c68d69f9963972a0592e5ac3d88 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -256,18 +256,16 @@ gtk_dialog_init (GtkDialog *dialog)
                     "delete_event",
                     G_CALLBACK (gtk_dialog_delete_event_handler),
                     NULL);
-  
+
   dialog->vbox = gtk_vbox_new (FALSE, 0);
 
-  /* gtk_container_add () from superclass */
-  GTK_CONTAINER_CLASS (gtk_dialog_parent_class)->add (GTK_CONTAINER (dialog),
-                                                     dialog->vbox);
+  gtk_container_add (GTK_CONTAINER (dialog), dialog->vbox);
   gtk_widget_show (dialog->vbox);
 
   dialog->action_area = gtk_hbutton_box_new ();
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog->action_area),
-                             GTK_BUTTONBOX_END);  
+                             GTK_BUTTONBOX_END);
 
   gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->action_area,
                     FALSE, TRUE, 0);